Adapt RpcClient to recent token method changes #11519
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 tasks
mvines
commented
Aug 11, 2020
| #[serde(skip_serializing_if = "UiTokenAmount::is_zero")] | ||
| pub delegated_amount: UiTokenAmount, | ||
| #[serde(skip_serializing_if = "Option::is_none")] | ||
| pub delegated_amount: Option<UiTokenAmount>, |
There was a problem hiding this comment.
Without the Option, you can't deserialize a UiTokenAccount in Rust. Ran into this in the spl-token-cli
mvines
commented
Aug 11, 2020
| @@ -703,103 +699,6 @@ impl RpcClient { | |||
| Ok(hash) | |||
| } | |||
|
|
|||
| pub fn get_token_account(&self, pubkey: &Pubkey) -> ClientResult<Option<UiTokenAccount>> { | |||
There was a problem hiding this comment.
Nuke things I added in for spl-token-cli but no longer need because the decimals is returned from RPC directly now
mvines
commented
Aug 11, 2020
| }) | ||
|
|
||
| let config = RpcAccountInfoConfig { | ||
| encoding: Some(UiAccountEncoding::JsonParsed), |
There was a problem hiding this comment.
Need JsonParsed to get at ui_account: https://github.com/solana-labs/solana-program-library/pull/259/files#diff-699eaaeda047bbb52683513a93d26000R381-R399
Codecov Report
@@ Coverage Diff @@
## master #11519 +/- ##
=======================================
Coverage 81.8% 81.9%
=======================================
Files 327 327
Lines 75559 75469 -90
=======================================
+ Hits 61834 61835 +1
+ Misses 13725 13634 -91 |
|
Looks like CI is being held up by a Travis "PR double build" https://docs.travis-ci.com/user/pull-requests/#double-builds-on-pull-requests It should be safe to merge once reviewed |
CriesofCarrots
approved these changes
Aug 11, 2020
mergify bot
pushed a commit
that referenced
this pull request
Aug 11, 2020
* Avoid skip_serializing_if since that breaks deserialization * Adapt RpcClient to recent token method changes (cherry picked from commit 17645ee) # Conflicts: # client/src/rpc_client.rs
mergify bot
pushed a commit
that referenced
this pull request
Aug 11, 2020
* Avoid skip_serializing_if since that breaks deserialization * Adapt RpcClient to recent token method changes (cherry picked from commit 17645ee)
mergify bot
added a commit
that referenced
this pull request
Aug 11, 2020
* Avoid skip_serializing_if since that breaks deserialization * Adapt RpcClient to recent token method changes (cherry picked from commit 17645ee) Co-authored-by: Michael Vines <[email protected]>
mergify bot
added a commit
that referenced
this pull request
Aug 11, 2020
* Adapt RpcClient to recent token method changes (#11519) * Avoid skip_serializing_if since that breaks deserialization * Adapt RpcClient to recent token method changes (cherry picked from commit 17645ee) # Conflicts: # client/src/rpc_client.rs * Fix conflicts Co-authored-by: Michael Vines <[email protected]> Co-authored-by: Tyera Eulberg <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Recent token RPC methods allow for some RpcClient clientup that
spl-token-clirequires